Merge commit 'upstream/0.1.4' into master.experimental
authorMatteo F. Vescovi <m.vescovi@revese.it>
Sat, 31 Dec 2011 11:17:28 +0000 (12:17 +0100)
committerMatteo F. Vescovi <m.vescovi@revese.it>
Sat, 31 Dec 2011 11:17:28 +0000 (12:17 +0100)
commit687c328195b9b658e4badcc5e35b544d378ddd74
tree972067ae5ff0577a46d6d7d9b0bdf96d84fd500d
parent87b31825c3df9d13f8f7906ffe0d11e46583afa0
parentbe1bfe1074b413b5a5d218d65ecde97d78117c7b
Merge commit 'upstream/0.1.4' into experimental